projects
/
emacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ac94737
)
Fix for crash when displaying xwidget in a tty
author
Joakim Verona
<joakim@verona.se>
Sat, 31 Jan 2015 20:07:07 +0000
(21:07 +0100)
committer
Joakim Verona
<joakim@verona.se>
Sat, 31 Jan 2015 20:07:07 +0000
(21:07 +0100)
Xwidgets are now handled the same as images in the tty case,
they are ignored.
src/xdisp.c
patch
|
blob
|
history
diff --git
a/src/xdisp.c
b/src/xdisp.c
index 5da611e05651fcb5973d338e30a33beefd987e41..d868633e25cf1fd22610ab2392efc5a8608c9c06 100644
(file)
--- a/
src/xdisp.c
+++ b/
src/xdisp.c
@@
-5135,7
+5135,8
@@
handle_single_display_spec (struct it *it, Lisp_Object spec, Lisp_Object object,
#endif /* not HAVE_WINDOW_SYSTEM */
|| (CONSP (value) && EQ (XCAR (value), Qspace))
#ifdef HAVE_XWIDGETS
- || valid_xwidget_spec_p(value)
+ || ((it ? FRAME_WINDOW_P (it->f) : frame_window_p)
+ && valid_xwidget_spec_p(value))
#endif
);